Other than the native kernels, the xen guests install without attempting
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 1 Jul 2005 15:48:47 +0000 (15:48 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 1 Jul 2005 15:48:47 +0000 (15:48 +0000)
to use distribution provided mechanisms, thus e.g. preventing the
auto-generation of an initrd. Below/attached a suggestion to adjust that.
Signed-off-by: Jan Beulich <JBeulich@novell.com>
linux-2.6.11-xen-sparse/arch/xen/Makefile

index 133d6e6b0ff5548336028dd31450d302136a89ef..451322bc694a27d6947071187f8b9f3e8dd8c29f 100644 (file)
@@ -63,8 +63,13 @@ all: vmlinuz
 vmlinuz: vmlinux
        $(Q)$(MAKE) $(build)=arch/xen/boot vmlinuz
 
+ifeq ($(INSTALL_PATH),)
+install.sh := $(shell find $(srctree)/arch/$(XENARCH) -name install.sh)
+endif
+
 XINSTALL_NAME ?= $(KERNELRELEASE)
 install: vmlinuz
+ifeq ($(install.sh),)
        mkdir -p $(INSTALL_PATH)/boot
        ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
        rm -f $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
@@ -75,6 +80,9 @@ install: vmlinuz
        ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
        mkdir -p $(INSTALL_PATH)/usr/include/xen/linux
        install -m0644 $(srctree)/include/asm-xen/linux-public/*.h $(INSTALL_PATH)/usr/include/xen/linux
+else
+       sh $(install.sh) $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
+endif
 
 archclean:
        @if [ -e arch/xen/arch ]; then $(MAKE) $(clean)=arch/xen/arch; fi;